Merge from mainline.
authorPaul Eggert <eggert@cs.ucla.edu>
Mon, 7 Feb 2011 01:04:05 +0000 (17:04 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Mon, 7 Feb 2011 01:04:05 +0000 (17:04 -0800)
commit59a293d25d68c0ddb2a269bebba6ac005b8e85ad
tree7ea91e9f040c791555bd429ae3f5b8876a62b2e2
parenteb91de4a3d9153a449459a8911b070ad2e9e256e
parent6150ef3d2715e2532962de61a3478747e87aa21e
Merge from mainline.